From: Joakim Verona <joakim@verona.se>
Date: Tue, 20 Aug 2013 06:46:50 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a5bc95171a89303358dffe02703825498b47d709;p=emacs.git

merge from trunk
---

a5bc95171a89303358dffe02703825498b47d709